Skip to content

Conversation

@marcleblanc2
Copy link
Contributor

@marcleblanc2 marcleblanc2 commented Mar 25, 2025

Linear issue REL-812: Update deployment types

Switching DEPLOY_TYPE from k3s to AMI, so that we can find these customer instances in telemetry more clearly.

@marcleblanc2 marcleblanc2 enabled auto-merge (squash) March 25, 2025 22:56
@DaedalusG
Copy link
Contributor

Let me make sure we don't have any pipeline gen stuff that looks at this env var

@marcleblanc2 marcleblanc2 disabled auto-merge March 25, 2025 23:14
@marcleblanc2 marcleblanc2 marked this pull request as draft March 25, 2025 23:15
@marcleblanc2 marcleblanc2 changed the title Changing DEPLOY_TYPE to AMI for AMI deployments Change DEPLOY_TYPE to ami for AMI deployments, so we can identify them in telemetry Mar 26, 2025
@marcleblanc2 marcleblanc2 changed the title Change DEPLOY_TYPE to ami for AMI deployments, so we can identify them in telemetry Chore: Fix deployment types in telemetry Mar 27, 2025
@marcleblanc2 marcleblanc2 marked this pull request as ready for review March 27, 2025 03:54
@marcleblanc2 marcleblanc2 merged commit 8d9f1b2 into main Mar 27, 2025
1 check passed
@marcleblanc2 marcleblanc2 deleted the marc/update-DEPLOY_TYPE branch March 27, 2025 03:54
@sourcegraph-release-bot

The backport to 6.0.x failed at https://github.com/sourcegraph/deploy/actions/runs/14098509337:

The process '/usr/bin/git' failed with exit code 128

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 6.0.x -p 150
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-6.0.x 6.0.x
# Navigate to the new working tree
cd .worktrees/backport-6.0.x
# Create a new branch
git switch --create backport-150-to-6.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8d9f1b2b67cc24567b03b499d4e492c63ca44c38
# Push it to GitHub
git push --set-upstream origin backport-150-to-6.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.0.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-150-to-6.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.0.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.0.x and the compare/head branch is backport-150-to-6.0.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot

The backport to 6.2.x failed at https://github.com/sourcegraph/deploy/actions/runs/14183859289:

The process '/usr/bin/git' failed with exit code 128

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 6.2.x -p 150
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-6.2.x 6.2.x
# Navigate to the new working tree
cd .worktrees/backport-6.2.x
# Create a new branch
git switch --create backport-150-to-6.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8d9f1b2b67cc24567b03b499d4e492c63ca44c38
# Push it to GitHub
git push --set-upstream origin backport-150-to-6.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.2.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-150-to-6.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.2.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.2.x and the compare/head branch is backport-150-to-6.2.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants